Skip to content

Conversation

@nickvergessen
Copy link
Member

@nickvergessen nickvergessen commented Oct 4, 2016

@MorrisJobke @tflidd

For testing you can apply the following patch:

diff --git a/apps/updatenotification/lib/Notification/Notifier.php b/apps/updatenotification/lib/Notification/Notifier.php
index 3e1bc94..d003265 100644
--- a/apps/updatenotification/lib/Notification/Notifier.php
+++ b/apps/updatenotification/lib/Notification/Notifier.php
@@ -66,7 +66,7 @@ class Notifier implements INotifier {

                $l = $this->l10NFactory->get('updatenotification', $languageCode);
                if ($notification->getObjectType() === 'core') {
-                       $this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());
+                       #$this->updateAlreadyInstalledCheck($notification, $this->getCoreVersions());

                        $parameters = $notification->getSubjectParameters();
                        $notification->setParsedSubject($l->t('Update to %1$s is available.', [$parameters['version']]));

diff --git a/lib/private/Updater/VersionCheck.php b/lib/private/Updater/VersionCheck.php
index f66e109..ffafc4a 100644
--- a/lib/private/Updater/VersionCheck.php
+++ b/lib/private/Updater/VersionCheck.php
@@ -56,7 +56,7 @@ class VersionCheck {
        public function check() {
                // Look up the cache - it is invalidated all 30 minutes
                if (((int)$this->config->getAppValue('core', 'lastupdatedat') + 1800) > time()) {
-                       return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
+                       #return json_decode($this->config->getAppValue('core', 'lastupdateResult'), true);
                }

                $updaterUrl = $this->config->getSystemValue('updater.server.url', 'https://updates.nextcloud.com/updater_server/');
@@ -67,7 +67,7 @@ class VersionCheck {
                        $this->config->setAppValue('core', 'installedat', microtime(true));
                }

-               $version = Util::getVersion();
+               $version = [9,1,0,9];//Util::getVersion();
                $version['installed'] = $this->config->getAppValue('core', 'installedat');
                $version['updated'] = $this->config->getAppValue('core', 'lastupdatedat');
                $version['updatechannel'] = \OC_Util::getChannel();

@karlitschek should backport the first commit down to stable10

Fix #1605

@mention-bot
Copy link

@nickvergessen, thanks for your PR! By analyzing the history of the files in this pull request, we identified @MorrisJobke and @rullzer to be potential reviewers.

@karlitschek
Copy link
Member

makes sense 👍

@MorrisJobke
Copy link
Member

Works as it should 👍

@MorrisJobke MorrisJobke merged commit 7c20aa2 into master Oct 4, 2016
@MorrisJobke MorrisJobke deleted the issue-1605-update-notification-readable-version branch October 4, 2016 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants